Refactor documentation
Fix formatting in quickstart
Fix embarassing typo
merge master