This is also part of pull req #6 -- is that PR out of date now?