Local commit to merge
Fixed for merge
Commented and ready for submission