refs #61
refs #57
Merge branch 'master' into issue-57
refs #57