Implement #482
Merge pull request #497 from dalkon/master

Implement #482