Merge pull request #70 from iRail/master

Sync
Fix #65 - ty @nicoverbruggen
Merge pull request #72 from iRail/development

Development