fixed #66 multiple bean support
#66 performance improvement with multiple bean support
Merge branch 'feature/66-multiple-bean' into dev