Updating richards branch with latest from master