update 20140410 Round 4 half
update 20140411 Round 4
Merge branch 'dev'