Tiny modifications
Merge commit