update apiary from dev branch