Merge pull request #284 from svost/solution