update README
Merge branch '2015dev'