Updated to latest commits from dev branch