Fork of apigen/apigen.  Fixes issue 225