tried to be more efficient
Merge branch 'develop'

Conflicts:
	src/emysql_tcp.erl