update
Merge branch 'master' of https://github.com/integrian/chakra3