Fixed #58 and #57