Closes #44 and #49