fix the bug #3
Merge branch 'issue/3'