Merge pull request #60 from shakilusgaonker/master

Fixed compilation errors because of UnitConstants