Updated/Compared with Transfix entries
Fixing bug #151
Merge pull request #155 from Jako/develop

Updated/Compared with Transfix entries