Make -n and -p faster
Merge pull request #305 from Mouq/nom

Make -n and -p faster