Ported the docs from the wiki
Fixed merge conflict