fixes #21 - pending small api change