Merge pull request #393 from ovatsus/master

Apiary improvements