ADDED AMAZING STUFFS 2
Merge funn3r/master