fix merge screw-up
Merge pull request #8 from PidgeyL/master

fix merge screw-up