close #12
Merge branch 'issue-12'
close #12