Merge branch 'master' into jake
update readme
Merge branch 'jake'