Manually added PR #24

Manually added PR #24 - just to keep commit history clean