Bug fixes
Merge branch 'master' of github.com:Lowingbn/iccpy

Conflicts:
	gadget/snapshot.py