merge master to development

merging 0.9.4 as the new development version