refs #9
Merge pull request #20 from lisztli/issue-9

refs #9