20140908commit
Merge branch 'master' of https://github.com/wlcyhao/light