Fixed null pointer after all rats found
Merge branch 'master' of https://github.com/adamreis/pied-pipers into samara
Merge pull request #15 from adamreis/samara

fixed null pointer & merged new code from master