Better commentated code
Merges