Feature/type clarification merge

Entity counter implementation, see Issue #137