merge fix
Merge pull request #2 from a4tech/master

Merge fix.