Fixed a error loading the solution caused by a rebase/merge error
Merge pull request #42 from alanquillin/FixBuildIssuesAfterRebase

Fixed a error loading the solution caused by a rebase/merge error