Merge pull request #11 from platanus-repos/develop

Update