Changed disk class behaviour issue #3
(cherry picked from commit 4d969e9)
Changed foreach, added 'Filesystem' handling and other improvements  issue #3
(cherry picked from commit e57ae31)