stevemao Merge pull request #1 from honzajavorek/patch-1