Merge pull request #68 from johncantrell97/118