Merged Master with Quang's Branch

Quang
17/09/2014