Merge pull request #36 from JRusbatch/dev

Fixes #35: Solution file should be located in the root of the repository