Merge pull request #2 from arc-framework/develop

Merge develop to master.