apiary doc added, added TODO comments
Merge branch 'origin/dev'