extended first implementation idea
Merge branch 'master' of https://github.com/stevleibelt/incubator
extended idea