Fix #543
Merge pull request #548 from soyuka/master

Fix #543