ujh Merge pull request #328 from ujh/refactorings …