Revert "Revert "Merge pull request #1 from bmwirth09/master""

This reverts commit fd5ffaa7734155455b8ad117868682b91c065394.