Working on docs 140920
dox more 140921
Hopefully improved start/stop logic
Merge branch 'bugfix' into dox

Merge to test bugfix in dox branch where testing material is available.

If bugfix successful, merge bugfix into master.