Fix some bugs
Merge branch 'master' of https://github.com/jennypeng/Firewall

Conflicts:
	firewall.py
	firewall.pyc