Merge branch 'issue29'