Fixes #17.
Add Oceanus and Zeus.
Merge remote-tracking branch 'origin/master'