Fixed for ARC
Merge pull request #15 from larsw/ARC

Fixed for ARC