Fix issues with current view-model-builder implementation.
Update Readme