Updated readme.
Merge branches 'master' and 'nightly-build'