Fixed issue #27 - Changed split to be regexp instead of string