fixes
Merge pull request #48 from vkorhonen/master

fixes