Merge pull request #321 from fpscan/master