fixing some issues
Merge branch 'master' of https://github.com/dina903/WPF.git