xach/zs3 — pull request #6 by cddr (2012-01-13 15:01:09+00:00)
Title: Updates from earlier pull request rebased on master

Hi Zach,

I applied Hans's updates to your latest tree.