Updated/Compared with Transfix entries
Merge pull request #153 from Jako/develop

Updated/Compared with Transfix entries