merging antoine
version bump
src file and line number printed
ansi pen, fixing output weirdness
Merge remote-tracking branch 'upstream/master'

Conflicts:
	pubspec.yaml