Update WIP 3249.
Merge pull request #17 from rseanhall/wip3249

Update WIP 3249