First try at #55
Merge pull request #1016 from eschaefer/master

First try at #55