Merge pull request #85 from orbea/git