Merge pull request #1539 from t-8ch/esniper