Merge pull request #141 from stasic/patch-4