Bug fixing
Fixed bugs #53 and #54