Solution for Issue#67 - Commit 2