Initial update
Merge pull request #1 from rjraffa/initialUpdate

Initial update