Hotfix 0.23

Tried to make a hotfix that seems to work ok. I'll just pull request you and you can see what you do :)
Just ignore the csproj and sln changes... my bad for committing them too..