bug fixes
Merge pull request #22 from danimrath/master

bug fixes