fixed copyright
added support for precomposed wheres
Merge remote-tracking branch 'origin/dev' into dev