Merge pull request #10 from uc-pkm/BETA

Beta
Merge branch 'master' of https://github.com/uc-pkm/testing.git