Work on ABP support
Merge pull request #29 from jetty840/dnewman-merge

Work on ABP support