Merge pull request #38 from SDIS62/master

Syncing with SDIS62 / prevarisc