* fixed bug
* build optimization