previous change was to the wrong file
Merge pull request #100 from amccollum/master

previous change was to the wrong file