Update with fixed bugs
Merge origin/master