ADDED better tests
CHANGED replace dot/minus and do lowerCase at once
CHANGED version to hotfix