bug fix
Merge pull request #1 from willwillis/master

bug fix