Dev Branch update 

Updates Dev branch...