fix issue04
Merge branch 'issue04'