Local work merged
Merge branch 'master' of https://github.com/oukiar/netget2

Conflicts:
	main.py