More Updates.
Merge pull request #3 from jrodriguezjr/updates

More Updates.