Changed a file reference in header
fixed a typo.
fixed get_next_entity()
Important bug fix.

Merge branch 'develop'