fixes #27, at last. api updates as well.