Updated Version

Also made more GIT friendly