Fixed handling errors
Fixed mass tag
Merge remote-tracking branch 'upstream/master'