Merge remote-tracking branch 'origin/master'

and work in progress for trakcing. @TODO create seperate project.