Merge pull request #59 from davidmoebius/cleanup

[cleanup] and adding license headers
[task] rebased with upstream/develop