Closes #107