solve minor issues
Merge origin/master
skrip initial value di tps