Fixed discrepancies
Merge pull request #44 from hintjens/master

Fixed discrepancies