address #58 - remove Topshelf
refactoring
Merge pull request #59 from cityindex/issue_58

Issue 58