ADDED AMAZING STUFFS 3
Merge funn3r/master