Merge branch
Removed unnecessary files and fixed version