Fix bug and add scrutinizer