Change-Id: Icfde2686c0a2871ae65b760313d690d75761b690
Merge branch 'master' of https://github.com/leonardograsso/misc.git

Conflicts:
	TEST

Change-Id: Ia595413677b6503f4e6b22fae17e887f2025be06