hand-merge in #50

closes #50