Merge branches 'master' and 'v0.3' of ssh://gandalf:7999/SRV/nanodecontrol into v0.3
mostly more client side code for #6