Import bug fixes
Merge pull request #83 from kiryx/master

Import bug fixes