refs #66
Merge pull request #67 from lisztli/issue-66

refs #66