Closes #151