back to static classes dude...
Merge origin/master