fixes and arc
Merge branch 'arc' of https://github.com/evertoncunha/EPCKit into arc