Modernized to work with array-style interfaces
Fix comment style and justification
Version 2.3
Merge branch 'development'

* development:
  Version 2.3
  Fix comment style and justification
  Modernized to work with array-style interfaces