Merge pull request #7 from estebanlm/master

updates to fix initialisation
- fixing some paths and path searchs in marina
- tide updated