Merge pull request #742 from annando/ap