updated info
Merge branch 'master'