fixed error with frame mismatching
Fixed merge conflict with master.
Merge pull request #35 from csu-hmc/sandy

fixed error with frame mismatching