Merge pull request #13 from DrJest/master

MetroNerdz 1.2