Closes #119