Merge pull request #252 from mikeh/master

PublicAPI support