Issue55

Creating this pull request, in case we have ongoing discussion related to this pull request.