reworked api, version 0.0.2