Trying to figure out how this all works
Merge pull request #2 from Barker404/master

ok, testing, testing :)