Fixed #185. Also added some much needed improvements to warp.
And small other things.
Merge pull request #191 from CensoredSoftware/split

Fixed #185. Also added some much needed improvements to warp.