Updated version and sync image name and tag.
Refactoring and bug fixes.