add code from merge
tree36eac00cf95224d06da0989431d48cb4efa5b916
-rw-r--r-- 57 .gitignore
-rw-r--r-- 2251 Build.PL
drwxr-xr-x - bin
-rw-r--r-- 165 changes
drwxr-xr-x - db
drwxr-xr-x - lib
drwxr-xr-x - t