use constructor reference instead of static "of" method
Merge origin/master