Minor fixes + Updated README.
Merge branch 'dev' into gh-pages