#424 alignment with apiary

Resolves #424 
Relates to #398