bug fixes
Merge branch 'master' of http://github.com/MatthieuBertin/TDDI15