Merge pull request #43 from kreczko/master

Changes for ARC