Fixes #1
Merge pull request #2 from soc/issues/001

Fixes #1