formatting
file from nook branch
Merge branch 'master' into nook