Conflict Resolutions...
Merge pull request #3 from gayanj/HDisk

Merge 3