STR data, STP intermediate... nothing finished :D
Merge remote-tracking branch 'origin/master'