Initial framework
Merge branch 'master' into framework
Merge pull request #1 from palmerhyde/framework

Framework