Merge branch 'issue42' into 'master'