Merge pull request #1 from ylepors/develop

First commit