2014-11-06 update
2014-11-06 for merge