Closes #106