fixed issues
Merge pull request #26 from brandondsz/master

fixed issues