Closes #128