Updated the project. Comments will be added in next commit.