Bumped version to 0.1-7
Merge branch 'dev'

Conflicts:
	DESCRIPTION
Added missing man page