updated main
Merge pull request #2 from jameyhicks/master

updated main