Merge pull request #1 from csc/master

Update from original