Merge pull request #215 from svost/trivial