issue done
added untracked files in issue-18
Merge branch 'issue-18'