Close Bugs

Close
Bug #541
Bug #542