Refactored

Signed-off-by: Rodrigo Miike
Merge branch 'master' into tlvParser

Conflicts:
	src/br/miike/TLVParser.java