Added step to remove .git folder
Merge branch 'release/1.5.8'