Completed by Ryan
Merge pull request #1 from krnryan/master

Completed by Ryan