bug fixes
Merge pull request #55 from apatel/master

bug fixes