bug fixes
Merge pull request #6 from mstarinteractive/bug-fixes

bug fixes