Bunch of updates.
Merged Dev and Master