Closes #41 and bump