Replaced functors to lambdas.
Replaced functors to lambdas.
Replaced functors to lambdas.
Replaced functors to lambdas.
Corrected typedefs.
Replaced static functions to lambdas.
Merge branch 'lambda'