Merge pull request #79 from stasic/patch-2