updated README
merge master origin/master