commit 12:45
Merge branch 'hotfix/issue2'