Closes #50

Implemented