updated README and CHANGELOG
Merge branch '20131220'