Added QueryBuilder

Fixed #45