Updated entries and directory.
Merge branch 'develop' into master