Development updates for master. 

full merge. deleting develop branch