fixed issue6
Merge branch 'issue#6'