much nice WPF
NU!
Merge pull request #25 from Klockz/master-fixes

Master fixes