Merge pull request #487 from liberodark/patch-1