bug fixes
Merge pull request #54 from apatel/master

bug fixes