added index [issue 05]
added fix for issue05
Merge branch 'issue05' into develop

* issue05:
  added fix for issue05
  added index [issue 05]