Updated
Merge pull request #16 from jayemerson/master-working

Updated