Merge pull request #252 from svost/code-fix