Updated everything.
Merge pull request #8 from jordanlgraham/updates

Updated everything.