Merge pull request #1104 from ey6es/master

Merge fix.