Merge pull request #1 from landrews/master

updating