Merge pull request #1 from zackcalex/feature

Feature pull request