addressing compiler warnings
Merge branch 'develop'

* develop:
  addressing compiler warnings