Major API changes + bug fixes (v1.0.1)