New parameters / New calling format
Merge branch 'master' of https://github.com/LeonardoNve/dns2proxy

Conflicts:
	dns2proxy.py