[task] reset to upstream develop
[fix] added tests that have been lost during rebase
Merge pull request #101 from davidmoebius/cleanup

[cleanup] adding header and clean up comments