Merge pull request #1 from naarcini/master

Comments and aminations fix
add daemon logic (doesnt work fully yet)