markheckmann Merge pull request #1 from jemus42/patch-1