Merge pull request #63 from cr1901/arty_s7