Commiting after Task #118 and Resolving Bug Task #126