Merge pull request #23 from maxwolffe/newframework

update master with some charts
remove merge conflicts
merge conflicts