refs #34
Merge pull request #45 from lisztli/issue34

refs #34