Fixed issues with formating
Small change of versions
Merge branch 'develop'