resolve #13
Merge branch 'issue-13'