Closes #132