fixes
Merge pull request #38 from ahcorde/master

fixes