Clean merge from seas
Merge pull request #13 from xuy/master

Merge all functional changes on seas server to master.