* added spring factory-bean support
* some minor update