closes #50
closes #45
readme