Lots done.. Nuff Said
Merge remote-tracking branch 'origin/master'