Merge pull request #1 from wpsvse/master

Update 2014-08-25