Issues connecting Entity API. Working out bugs
Merge remote-tracking branch 'origin/master'