0.3.4 development

Update development branch