Merge pull request #11 from Kwoth/cortex

Some minor changes
Rewrite
Docs moved