Closes #133