Fixing solution files issues for successful build
Merge pull request #227 from alhardy/master

Fixing solution files issues for successful build