Fixes
Merge pull request #92 from Chopy/master

Fixes