Merge branch 'fpy_lvm' into 'master'

Support for LVM

See merge request !8