fixes #38
starts #39