Core fixes
Updating version number
Merge branch 'feature/Core' into develop