Fixed #56 and #57