Closes #46