Fixed scrutinizer bugs
Merge pull request #29 from pborreli/fixed-scrut

Fixed scrutinizer bugs