Merge pull request #10 from MC3D/development

Development