Reformat code
Fixed merge conflict
Reworked 'findOptions' method to allow more flexibility
Release 1.2