Updated behaviour
Move everything into its own class
Merge branch 'master' of github.com:eventsd/eventsd