Merged volume patches #46, #47, and #48

Completed the patch. Should be ready for a merge as I just used https://gist.github.com/vivien/0dbbecd0372f808a895c.