Merged in pull request #42

Had to do it manually as the project has now a XAML version of the UI as
well.