changed array structure
Merge branch 'master' into namespaces