First pass at #428
Merge pull request #838 from sodaplayer/patch-1

First pass at #428