fix issues
Merge pull request #12 from ahcorde/master

fix issues