Merge pull request #107 from podio/master

Update develop branch with master branch