Merge pull request #333 from Malaquitte/patch-2