Fixed problems.
Merge origin/master