Fixing issue #16.
Merge branch 'refs/heads/ARC/develop' into ARC/master