Merge pull request #1 from houchker/master

Update