Merge pull request #340 from Bertram25/development

Several stuff toward the 0.4.9 release