Merging chris with master