Closes #453.
Merge branch 'master' into operator()