framework improvements
Merge origin/master