Initial commit for the dev branch