Closes #28