Merge pull request #218 from ihptru/master

fixes related to reports