Merge pull request #23 from deanhiller/master

merging deanhiller with easility
Fixing querying on super classes
removing redundant code
Merge pull request #79 from easility/master

Merging easility with deanhiller