Merge pull request #3 from landrews/master

updating