Added AP info, issue #24