Re-wrote to be much more simple
Merge pull request #1 from ibbignerd/master

Re-wrote to be much more simple