Set version
Hotfixed
Merge branch 'HotFix'