refs #61
Merge pull request #62 from lisztli/issue-61

refs #61