Refactored makedrive
Merge pull request #9 from sedge/refactor

Refactored makedrive.