HOTFIX: Backwards-compatiblity fix for #46
Merge pull request #47 from pwendell/hotfix

Hotfix