Bumping version
Merge pull request #24 from imhotep/customFrameworks

Custom frameworks
Merge branch 'upstream'