fixes for msvc
Merge branch 'master' of https://github.com/krzysztof-jusiak/di