Merge pull request #1 from ArtS/master

Update from base.