Removed extensions from the Readme, it is experimental and we will probably end up gutting it and re-implementing it
Fix a typo, also a better way to handle this
Merge branch 'master' into development