Bug Fixes

Close:
Bug #289
Bug #290
Bug #291
Bug #292
Bug #293
Bug #294