fixing references
Merge branch 'master' into fixes