Tom byrer patch 1

Derived from #17.