Version bump
Fixing bug in setup files.
Another fix in comments handling
version bump
Merge branch 'release/v0.7.x'

Conflicts:
	setup.cfg
	setup.py