Rebase stuff
Forgot the new feature
Merge pull request #56 from JHUAPL/TP26

Rebase stuff