Added new solution and merged existing changes from older repo.

GitHub - Issue #2