d4ndo Merge pull request #1 from jlund/patch-1