minor changes
merge with origin/master