Major update @Jake, git:jakehaas
Merge pull request #7 from jakehaas/dev-major-update

Major update @Jake, git:jakehaas