minor changes
Merge commit 'e6bd60fd7bacd57857d66f0aa95e29954791c873'