fixes
fixes
Merge pull request #11 from takeit/master

fixes