Minor fixes
Merge pull request #3 from twokul/minor-fixes

Minor fixes