Remove use of []. Issue #12
merge