Version 1.6.0 stable
Update version
Merge dev