Merge pull request #375 from jdgleaver/disk-control-v1