Merge branch 'master' into profile
Adding / updating documentation