final framework still needs lots of detail adjustments
Merge pull request #1 from Pickra/master

final framework still needs lots of detail adjustments