Merge pull request #27 from vzsze/patch-1