Merge pull request #10 from PersistentSystemsLimitedSoftLayer/master

Merge pull request #59 from shakilusgaonker/master
Fixed compilation errors because of UnitConstants
Merge pull request #60 from shakilusgaonker/master

Fixed compilation errors because of UnitConstants