updated
Merge pull request #3 from davidmferris/master

updated