Merge pull request #16 from yzf/alpha

OK