Indent further
Replace fixes with updates
Merge pull request #207 from continuuity/feature/upgrade-guide

Feature/upgrade guide