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

[cleanup] and adding license headers