Fix default arguments

error: default arguments cannot be added to an out-of-line definition of
a member of a class template
Merge branch 'bugfix_default_arg'