Changed last step in maintaining instructions. Fixed formatting issues.
Merge branch 'master' into linda-stable