Fix the code wrt. a bug in VS.
Merge pull request #104 from l-korous/master

Fix the code wrt. a bug in VS.