Merge pull request #2 from isao/develop

improve test, rm whsp