fixes #44

I need to setup a way to test this.
fixes #45
Merge pull request #47 from agrc/44&45

44&45