Use helper function instead of own code
Fix #164
Added changelog
Improved automatic short help detection.  This fixes #165
Merge branch '2.x-maintenance'