Fixed #44 and fixed #34