fix issues
Merge pull request #6 from ahcorde/master

fix issues