STUFF
Merge pull request #1 from VirtualViper1/master

STUFF