Merge pull request #2 from hMeU/master

Let me mess around, will ya!#close
Merge pull request #3 from hMeU/master

TJ will freak out. Totally! :D
Last commit
hope it resolves