Merge Style Into Master

Final Merge of Style