Merge pull request #1 from Snowl/master

Changes from Master
Merge pull request #2 from Snowl/master

sync Push
Update App.xaml.cs
Update MainWindow.xaml.cs
Update AssemblyInfo.cs
Merge pull request #15 from Giswald/Code-Cleanup

Code cleanup