stwork merged to master