Fixes 50
Closes #47
Fixes #51, Closes #48