First update, problem 1
Merge pull request #1 from scline13/master

First update, problem 1