Merge pull request #116 from mamarley/splitfix2