new architecture
bug fixed #46
bug fixed
merge master
merge dialect