khaled's first commitsta

Signed-off-by: Khaled Hassan <khaledjhassan@ufl.edu>
khaled's second commiteru
Merge mason's merge of my commit.

Say that five times fast...