Merge pull request #1 from Hube2/Dev

updated to work with ACF-Pro
Merge pull request #2 from Hube2/master

Merge pull request #1 from Hube2/Dev