First try at #57
Merge pull request #764 from NickEngeldinger/patch-1

First try at #57