fixing #30
Merge pull request #31 from chrislaughlin/master

PR: fixing #30