Fix some inconsistencies.
Merge branch 'master' of https://github.com/minhtrangvy/AirPool