Fix for special cases about the base value
Merge pull request #21 from jakwings/master

Fix for special cases about the base value