redo
Merge pull request #55 from jloehman/jason

redo