some changes
Merge branch 'issue-5'