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

Updated/Compared with Transfix entries