Fix line spliting in MAC & Windows
Detect external git reset and other possible changes
Remove unused method
Update version