Merge branches 'master' and 'john'
update readme
Merge branches 'john' and 'master' into john