small utility classes
Merge branch 'origin/master'