Minor fixes
Merge pull request #261 from Macxim/patch-3

Minor fixes