fixed 2 issues
fixed 2 issues
Merge remote-tracking branch 'aivb/master'