Jabari's update
Merge pull request #24 from jabari4311/patch-9

Jabari's update