Closes #156