fix issue #29
Merge branch 'issue29'