Changed some internals.
Updated README.md.
Merge commit '8868e30968d06ccf1cb631525c265ec66b53c8e1'