added daemon support
Merge branch 'rp-daemon'