Closes #49