Merge pull request #9 from paulcastro/issue_8

Issue 8