Issue 356: initial commit

Please review this pull request for issue 356.