Bug #44 Fix
Bug #45 Fix
Bug #47 Fix