Merge pull request #1 from ljcode/master

update2014-11-25