Feat/production

close #30 #58