I've tried to let as much functionality untouched as I could.

I'll change it the way you want.
This PR anyway contains breaking changes to the behavior, cause currently it doesn't matter which switch except ```-l``` you use the tool increment the versions.