Merge pull request #40 from tjwatson/updateFrameworks

Update frameworks