Cleaner parser architecture
Merge branch 'master' of https://github.com/potash/visiblehand