bug fixes
Merge pull request #34 from apatel/master

bug fixes