Update 3
Merge pull request #4 from Cdingram/master

Update 3