added an ability to use a where clause
Merge branch 'master' of github.com:toktoktok/flourish