closes #38
closes #37
closes #39 and bump version