merged master into develop
fixed typo in array index name, closes #3