Final Commit for the Week

Changes to master