Fix #153
Fix #149
Fix #154
Merge pull request #156 from penguinho/master

Bug Fixes