#552 - added MBstring check
* API : ADD not to be used
* various small changes