Refactored and fixed.
Merge origin/master