bug 1 fix
bug 2 fix
bug 2 fix (bis)
bug 3 fix
Merge branch 'bug3'
bug 4 fix
bug 4 fix (bis)
Merge branch 'bug4'