Updated
Merge pull request #7 from kenmunyap/master

Updated