Merge changes Ic84efbde,I7c1c6044 into sc-dev

* changes:
  Implement a simple worker thread
  Move headers to include/ and clean up style