Added solution
Merge pull request #260 from civilframe/master

Added solution