Fix/quantcast

should close #113 and #112