refs #57
refs #61
refs #57
Merge branch 'master' into issue-57
refs #57
refs #58 #57
Merge pull request #63 from lisztli/issue-57

Issue 57