added conditions parameter for record class
Merge branch 'master' of git://github.com/twinh/wei