bug fixes
Merge pull request #24 from mohsalvi/master

bug fixes