Merge pull request #324 from pmq20/master

Fix #320