Closes #159