Merge branch 'issue115'