fixes
Merge pull request #42 from yunixon/fixes

fixes