Reviewed code
Merge pull request #1 from sethhoward1988/patch-1

Reviewed code