Merge pull request #13 from orignal/master

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

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

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

fix VS project