modified namespace feed to entry.
Merge branch 'feature/issue-1' into devel