Merge pull request #67 from BitLimit/master

Fixes EntityManager returning incorrect RemoteEntity
Keep coding style.