Rewritten performing of standard cmdline arguments
Version bump
Merge branch 'develop'

Conflicts:
	debian/changelog