Merge pull request #45 from Timo6/master

Update frameworks