Merge pull request #1 from lightszero/master

pull request 2014.09.09