complete last commit
Merge branch 'master' into devel