Merge pull request #3 from ericlynnpeterson/feature/my_new_awesome_feature

More changes!