merge versions
Merge pull request #6 from crhisnoriega/github/master

merge versions