update 20131119
update 20131120
Merge branch 'jacob'