Merge pull request #300 from svost/patch