Fixed discrepancies between the master branch and the development branch.