fixes
Merge pull request #40 from ahcorde/master

fixes