Add solution from lbain
Merge pull request #347 from lbain/patch-1

Add solution from lbain