Closes #126