Development

Updated development branch from bgrimstad