Fix. issues #43 (API broken)