Merge pull request #14 from OceanLabs/master

Minor tweeks