Closes issue #35
Implemented #10, #34