Closes #131