changed [] with array() for back compatibility
merge with master