Major update w/ fixes and such.
Merge pull request #6 from IPaytonn/patch-5

Major update w/ fixes and such.