closes #46
addresses #50