bug fixes
Merge pull request #3 from sandyshady/master

bug fixes