coping with issue
Fix bug #1
Merge branch 'bug/1'