Closes #17