Merge pull request #496 from dalkon/master

Fix #462