close #46 + QA