Merge PR #2

Closes #2