Merge pull request #323 from fpscan/master