modified the apiWrapper so that can handle discprition
Merge remote branch 'origin/master'