fixes
Merge pull request #1 from takeit/master

fixes