merge with sammy master branch