Merge pull request #117 from jloehman/mallory

Mallory