v2
Merge branch 'master' of https://github.com/magruene/SeaPal.git