Merge pull request #4 from orignal/master

Merge pull request from orignal/master
Merge pull request #5 from orignal/master

Merge pull request from orignal/master
fix VS project
Merge pull request #77 from chertov/master

fix VS project