renaming to avoid conflict with stdlib
change data structure that contains state bindings
- for avoiding duplication of bindings
- fix #40
Merge branch 'master' into searching-datetime