Let's just be honest
Merge pull request #273 from gseitz/topic/honesty

Improve the honesty of the code