updating to master
Merge branch 'damien'