minor modification
Merge branch 'master' into joseph