Fix splitting and indexing.
Merge branch 'master' of https://github.com/newhoggy/phalange