MAJ 28/11 CPT
Merge branch 'dev' of https://github.com/mjonckiere/hades into dev