Merge pull request #60 from lhein/7.2.x

upgrading to version 355