Merge pull request #1 from jpkempf-2/master

Please merge my pull request