Issue #162 - Following apiary's API