code modernisation; ARC support;
Merge pull request #4 from tgrf/master

code modernisation; ARC support;