fixes
Merge pull request #5 from jkaberg/master

fixes