Revert "revert to end of A1"
Merge pull request #2 from joelcheriyan/revert-1-master

Revert "revert to end of A1"
merge conflict