Stabilization: Bug #1 fixed
Stabilization: Fix for Bug #2
Solution name changed in the last minute
Merge branch 'release/1.0.1' into develop