Refactoring
Merge branch 'develop' of https://github.com/emoacht/DiskGazer.git