Merge branch '38-safari-bug' into 'master'

Resolve "Matching Bug"

Closes #38

See merge request !55
3 jobs for master in 9 minutes and 47 seconds (queued for 2 seconds)