update
Merge branch 'dev' of https://github.com/mjonckiere/hades into dev