Merge pull request #250 from MaxyMoos/280-chr-support