Framework issues
Merge remote-tracking branch 'Ribbit/master'
framework