bug fix
bug fix
Merge pull request #48 from apatel/master

bug fixes