Minor modifications
Merged head
Fixed a minor merge issue.