Added solution file missed in intial commit.
Merge branch 'master' into develop