Merge pull request #1 from Tony-Gagliardi/master

Update 1
Test2
Merge pull request #4 from ChrisFichman/master

Test 2