Merge pull request #48 from morphis/morphis/fixes

Morphis/fixes