Merge of Develop Branch

Merging and merging.