Issue 402 Pull Request