refs #41
Merge pull request #43 from lisztli/issue-41

refs #41