cytopia Merge pull request #34 from devilbox/release-0.36