Handle special cases a bit better
Don't worry about 1 and lower
Merge pull request #1 from jspc/additionals

Additionals