Closes #46 and #50