fix issue #6
Merge branch 'issue6'