added loop(s) for better handling
Merge remote-tracking branch 'origin/master'