merged latest style guide from master branch