Merge branch 'master' into development
first version matrix input
added matrixinput
Merge branch 'development'