Merge pull request #25 from MC3D/master

merged branch 'master' into development branch