Updating dev branch with initial curated version of master