Made the scribbles more bulletproof.
Merge branch 'dev'