[task] reset to upstream develop
Merge pull request #137 from davidmoebius/cleanup

[cleanup] and adding license header