fixes #540
Merge pull request #1417 from jsbin/fix/540

fixes #540
Remove all things not loop-protect.
Add all of the split package information.