Added basic methods for disk usage
merge fixed