Better handle implementation dependencies
Merge branch 'master' of https://github.com/AdeleResearchGroup/ApAM