fix issues
Merge pull request #5 from ahcorde/master

fix issues