Fixed #6 and #34