Volume example
Misc changes
Apply stashed changes from neutron branch
Fix pep8 alerts