BUG: fixes for 3.1 version, updated function calls
Merge pull request #9 from mandrew/frameworktest-fixes

BUG: fixes for 3.1 version