Closes #130