Merge branch 'a14n.issue-17'