Merge pull request #90 from nabinhait/master

AP issue