This should fix #12

Hacked OL for this a bit though...
Merge pull request #21 from bpross-52n/master

This should fix #12