Don't fork in daemon mode
Merge pull request #62 from mrdomino/master

Don't fork in daemon mode