Work laptop

Work laptop branch merge to master pull request