Merge pull request #3 from goldenice/master

Update from original