mini changes
Merge remote-tracking branch 'origin/master'
Updated to framework
Testing adding to other projects