Closes #173