Merging Feature/local tax

Merged of #773