Adding handling for VM question

Additional indent fixes.
prepare test version 1.0.1 for deployment