Fixed API

Resolved #27