Merge pull request #3 from SecUpwN/master

merge upstream
fix regression - service not loading correctly on startup
Merge remote-tracking branch 'origin/master'
Merge pull request #131 from tobykurien/master

Urgent fix for service not starting up correctly