Merge pull request #1 from OpenCPN/master

Update from original