Added API, didn't test yet. see #6