Merge pull request #2 from mastacontrola/master

Updating for you.
Merge pull request #3 from junkhacker/master

Merge pull request #2 from mastacontrola/master