Merge pull request #1 from StargateArmA/master

Update from master
bissl smarter
Merge pull request #2 from TDC-Insane/master

smarter