Closes #100