Merge branch 'issue95' into molindo