Resolve merge conflict in PR #225
Merge pull request #242 from wizzat/pr_225

Resolve merge conflict in PR #225