Merge pull request #38 from sli-fox/steph_branch

Fixed bug in black cat