Merge pull request #2 from MassD/master

Solve problems 94 and 97.
Shorter solution
Merge remote-tracking branch 'upstream/master'