working commit. v2.0.2
Add image tagging / fix bugs