Fixed readme.
Merge branch 'devel'
Merge branch 'devel'
Merge branch 'devel'
Merge branch 'devel'
Merge branch 'devel'
Merge branch 'devel'
Merge branch 'devel'
Merge branch 'devel'
Merge branch 'devel'
Removing the hacks for now :(