Added API to resolve #15