Merge pull request #162 from xi-project/quickstart-fix

Fixed quickstart.
Merge remote-tracking branch 'origin/master' into better-extension-req-tests