Fixed bug.
Merge origin/master