Merge branch 'test' of https://github.com/thanhsm/test into test

Conflicts:
	README.md