support for new features in 3.1.0 & bug fix