Merge pull request #1 from mavenugo/issues/35

Fixes #35