Merge pull request #456 from hnyman/stat-config