Merge pull request #14 from OceanLabs/master

Minor tweeks
Merge pull request #16 from OceanLabs/Backup

Merge pull request #14 from OceanLabs/master