Closes #55