tiny bugs were fixed
Merge remote-tracking branch 'upstream/master' into new_import