Merge branch 'release-0.3.5'
give the CPU a rest every now & then when watching
updating version numbers
added entry for v0.3.6
Merge branch 'release-0.3.6' into dev

Conflicts:
	CHANGELOG