Made some really cool changes.
Merge pull request #1 from jcuratolo/Justin

Made some really cool changes.