Issue #2 fixed. Splitting is now automatic