Merge pull request #108 from podio/develop

Merge pull request #107 from podio/master
Merge pull request #109 from podio/master

Merge pull request #108 from podio/develop