Merge branch 'issue-2'
- issue 3 done
Merge branch 'issue-3'
- new changes in issue 2