Fix daemon prompt
Merge branch 'devel'
Set correct version number