added support for windows
small refactoring
Merge branch 'develop' of github.com:strongqa/howitzer into develop