fixes
Merge branch 'master' of https://github.com/manuamador/Z

Conflicts:
	ImageCreator.jl