This fixes #2 and would close issue #2