Merge pull request #4 from travis/usl

update the usl branch
Merge pull request #5 from travis/usl

back to snapshot
Merge pull request #6 from travis/usl

fix some core clobbering
back to snapshot