update for techcikl
Merge branch 'work'
Merge remote-tracking branch 'origin'