inconsistency between 1:25 & 1:18-19

What came first? the beast or the man? I flipped a coin and solved that inconsistency...
Merge pull request #13 from knabe/master

Fix inconsistency between 1:25 & 2:18-19