Merge pull request #1 from wpsvse/master

Update 2014-08-25
Merge pull request #22 from EyesX/master

Merge pull request #1 from wpsvse/master