my change
Merge pull request #24 from dominickmiller/nick

my change