addressed 1 and 2 from Vojta
Merge branch 'master' of https://github.com/subodhvsharma/paper-NPC