final modified 2014/12/22
Merge remote-tracking branch 'origin/master'