bklaric Merge branch 'development'

Latest commit ecad184

Oct 29, 2018