Updated
Merge pull request #6 from hii488/master

Updated