modified framework
Merge branch 'master' of https://github.com/rash805115/rnj