Merge pull request #1 from ptgn/master

Update from original