Correct syntax in examples
Correct parser so it now reads files with dtypes
Merge remote branch 'origin/master'

Conflicts:
	src/parser.cc