Hung - 26/9/14
Merge remote-tracking branch 'origin/master'
Hung - 26/9/14 2nd time