Merge pull request #3 from tompi/master

Send entity as argument to schema methods
bugfix