merging in changes from forked uplift #10

Closed rarebreed closed 8 years ago