added more bugs
Merge remote-tracking branch 'origin/bahobranch'