Now with image support!
Merge branch 'update'

Conflicts:
	README.md