parse and scanner changes
Merge branches 'dev' and 'master' into dev
added dumpTable function