First shot at #353
Merge pull request #947 from eschaefer/master

First shot at #353