a8 changes
Merge pull request #33 from raheelahmad/third-a8

a8 changes