#625 added handling of hash inside quotes
Merge remote branch 'fork/625'