Fix #57
Merge branch 'For-issue#57'