Merging patricks branch with master