Merge pull request #13 from Surt/develop

Update Master to last develop