Final Commit

This is final commit for the project. Some minor changes have been made
since the last commit.