change s#3
merge with master