Merge branch 'feature_6'
Merge branch 'master' of https://github.com/cantidio/duEngine