Update dev branch to latest

This is the start of a more contribution friendly branch