fix merge conflict
Merge pull request #78 from Soundnode/develop

Update to version 0.2.0