Issue 396 Pull Request