Fixes #3 on GitHub