small amendments
Merge origin/master