Minor fixes, and added APEZProvider
Merge pull request #1 from psyon/psyon-fixes

Minor fixes, and added APEZProvider