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

fix merge screw-up