add draft issue-15-6
Merge pull request #240 from callmewhy/new/issue-15-6-callmewhy

add draft issue-15-6