Bug #44 Fix
Bug #45 Fix
Bug #47 Fix
Merge pull request #53 from gitcac/husain-wip

Bug Fixes (#44, #45, #47)