Feat/production

close #60