cytopia Merge pull request #11 from cytopia/closed