Minor fixes
Merge pull request #5 from pismenny/master

Minor fixes