Merge pull request #1 from highsea/highsea

merge
Merge pull request #2 from highsea/master

Merge pull request #1 from highsea/highsea