Merge with master

Updating to new workflow