Fix #325
Merge pull request #327 from duxet/master

Fix #325