Merge pull request #1 from bcaffo/master

2014-6-9 StatInf pull