Jocelyn Final Update
Merging changes between jheppler and jhickcox branches