performance improvements

- don't use regexp when not neccessary
- don't use array_merge, that's very slow in this case
master is 0.1, set alias so we don't have to maintain two branches