Merge pull request #211 from htlxyz/framework_test

modify code
cleanup