Fix bug #479
Merge pull request #168 from bendiy/master

Fix bug #479