Merge pull request #60 from stasic/patch-1