Added entities
Merge pull request #2 from Scauser/branch/daniyar

Added entities