Fixed
Merge branch 'master' into apa-lib