Merge branch 'master' of https://github.com/synergix/nouvBamp27.git