Initial version of volume control
Merging from master