cytopia Merge pull request #9 from cytopia/closed