Bugs fixed.
Merge origin/master