Past development

Updating Master to final version