fix issue #28
Merge branch 'issue28'