flag changed from int to boolean for current status.
Merge remote-tracking branch 'origin/master'