see master branch for actual commits