Merge pull request #530 from mhajder/patch-1