Minor bug fixes
Merge pull request #294 from pigalot/master

Minor bug fixes