merged master to develop branch
Merge pull request #1 from heltonritter/develop

merged master to develop branch