Merge pull request #447 from srdjanrosic/patch-1